Clean up crap.
Make it 2.
Make controller suffix optional.