more things cleaning up code