Fixed NoneType, removed excess prints