bullet typing

made it easier to make the bullet different types and cleaned up some
code