Clean up code
Cleaned up code