Clean me up

5