code clean up: spaces around operators, removed trailing white spaces, added deliminator rows for increased readability, minor simplifications