minor changes for performance