Small edits to improve speed