Controller cleanup
Merge remote-tracking branch 'saiv/master'