changed indentation from 2 spaces to 4 spaces; code cleanup