Minor refactor to attempt

Just a small update