Cleanup&Unify controller parsing