Cleaned up sub-block markups