Applied codestyle and optimized imports