Few small clean up things