Slight cleanup and commenting