Clean up/refactoring with Arlandis