Cleaned a bit in Controller