Updated comments and removed one #define line