Minor update

Fixed some minor formatting issues and continued my project of combing
through each function looking for ways to improve the code, reduce app
size and memory footprint, etc.