cleaned up more controller code, very pimp now if I must say so myself