clean up some logic w/ osx java parsing