cleaned up code, added more whitespace