Cleanup and Comment

gotta fix the infinite recursion problem