Clean up
Code Cleaned Up