Cleaned up a little in BlockMap