cleaning up formatting, code
cutting down the line count, cleanup