review & code cleanup