style
fix building both
refactoring
clean up
better naming
bomb