cleaned up code and comments from prev commit