Removed comments and other useless stuff