Private source methods
Remove unused method
Moving all style functionality from source to style