Took out old comments and code
Code tidy up, using the right Class call to get layers