Removed comments and small changes