Cleaned up code
1a