tidying the mess stuff