Reindent and removing controllers prefix