Cleanup, remove unnecessary properties and refactor as methods