removed temp #define's, changed indentation