Fixed do and minor cleaning