* code clean
* database handler
