Cleaned up the bullet class