Fix indentation, comments and trailing whitespaces