Removed console.log calls, Cleaned up Commented code