moar comments and removed useless define