cleaning up code in Visitor class
code cleanup
massive code cleanup
fixed build