Code Cleanup

Added Somethings