better code practice changes for all Changemaker files