Consolidating round preparation logic

This should fix issue 33