review code and adjust