Ongoing work.
   - Cleanig up views and facades