cleaned up headers, moved comments around