code cleanup
organized imports
new codestyle