Some refactoring

I would have created a story for this request, but this goon (Robert) only gave us the link to the tracker, but not member access.