finished block refactoring, merged Block and RoundBlock