Fix indentation and other code formatting