Cleaned up Controller