Code cleanup

Committed cleaned up code with regression tests and excel report code