Code tidy up.