Revamped bullet class

Easier to read code with less errors