Fix indentation and code standards