Ref fit line length into 80 chars
Ref unused imports
Mod database properties in separate file