Fix code style / indentation issues