Removed some more comments and added asterisk marks