Cleaned up code
Code Clean up