Code Cleanup

Just Cleaning Code