Moved code to match indentation in development branch (1.2.0)