Removed comments and console statemets