Thomas - Refactor bullets