Small clean up
Changes