More tidying/refactoring in decking.js