fixed codereview stuff