Went through and removed some nits