Cleaned Controller