Little clean up on code