some code cleanup

removed unnessary imports & line spacing
Merge branch 'code_cleanup'