cleanup to develop

Overall code refactorisation