moved comments around to make things prettier