Removing commented out code
Refactoring out layer creation