Refactoring bullet (WIP)