Cleanup

general code base cleanup