Correct identation and codestyle