Updates to make code follow CodeMaid style guidelines.