Code review - styled, some minor changes