Various formatting updates and reducing variable name lengths in an attempt to help readability