#23 Cleaned up code