Fix more indentation and code styling