Refactor trello

Finished what we started during today's remote pair-programming session.