Code review

Please fix.