bullet code optimizing & clean up