Minor straightening up
Initial checkin