Tidy up

Just making things smooth :)