Various clean-up suggestions

delay.h should not be used and #define should be moved the .h files
Revert "Various clean-up suggestions"

This reverts commit 01ff4a00e283208d7c6ffdbe21b5aa9453812854.
Various clean-up suggestions
Added edited files with clean-up comments
Merge branch 'BK-Clean-Up'