cleanedup
better blocks