Cleaned up code. Removed print from some classes