Cleaned up prints and code