Some clean up, couple comments, broken test