Cleanup after code review