Dev - tidy up changes