Trim haml, pull command instantiation out of loop, todo: collection