Split and simplified block and loc functions