Fixed things from code review