Little bit of cleaning up