1.32 Cleaned up code