Cleanup, remove unnecessary properties and refactor as methods. Alias css and slug methods
Fix merge conflicts