Cleaned up code
Clean up code