1.34 Cleaned up code