make it at least fluid and tidy up