Revert "Fixing Merge Issues"

This reverts commit b702ee075b7fd2d7c19dac89a121d55fc785ae7e.
Revert "added macros, removed all magic numbers"

This reverts commit 71c759bbd4c3b87dc6ccbf504388fa4dbb008a28.