Code Review

No debugging statements in master! :see_no_evil: