Refactor funciton names to match master (626e6f2)
Remove all `print` statements