View and controllers clean-up