Tidied up for ClearOS 7