Refactor methods out of massive dioramaCommand file