cleaned up some variable assignment issues in controllers