Removed comments, minor code improvements