Cleaned up all the excess printing