Some code changes

Removed cross.h and cross.cpp, two functions in cross.cpp were moved to
main.cpp
Removed some macro defines
Cleaned code