Fixed n + 1 queries
Made helper so code not repeated
Removed extra spaces
Merge pull request #41 from monroepe/bullet

Fixed n + 1 queries