Cleanup
Tweaked code as advised by Ben ℅ Ashley