Decouple Refactor
CleanUp Controller
Added Easy