Refactoring to make it less ugly
Remove prints