Cleared up unnecessary codes and comments