Minor cleanup of blocks in base template