Fixed whitespacing (Eclipse format command)
Fixed indentation for switch statement, removed duplicate method.