a little more minor refactoring and cleanup
a little more minor refactoring and cleanup

jvkops/alloy,4talesa/alloy,jvkops/alloy,NadsonFernando/alloy,indera/alloy,FokkeZB/alloy,indera/alloy,brentonhouse/brentonhouse.alloy,bhatfield/alloy,brentonhouse/brentonhouse.alloy,jvkops/alloy,4talesa/alloy,xavierlacot/alloy,jppope/alloy,jppope/alloy,mobilehero/adamantium,xavierlacot/alloy,NadsonFernando/alloy,FokkeZB/alloy,NadsonFernando/alloy,indera/alloy,mobilehero/adamantium,brentonhouse/brentonhouse.alloy,jppope/alloy,WY08271/alloy,mobilehero/adamantium,FokkeZB/alloy,WY08271/alloy,xavierlacot/alloy,WY08271/alloy,bhatfield/alloy,4talesa/alloy,bhatfield/alloy