Standards cleanup