Code Cleanup

**The Issue**
No real issue but the code looks strange if different intendentions are used.

**The Fix**
This PR fixes the strange intendention by using tabs, sorting the imports and simplyfy code readability in one case.