tidy up - remove warnings