Fixing controllers to be more uniform solving issue #31