Merge branch 'f/cleaner-classes'