Cleanup

Removed some debug prints, stopped passing variables that weren't
needed, use a helper method. More to come