Only use two layers and cleanup
Merge pull request #1 from crosbymichael/improve

Only use two layers and cleanup