Removed some more inline blocks