Removed comments and logging