Attempt at fixing formatting/indentation