more code cleanup, testing with block areas