Removed comments and commented code