Tidy up
Unsure if this will work