resolving some code warnings
code reformatting and optimising imports