Cleanup code, fix ruby classpath