Make code more readable, fix indentation and traling spaces.