Fixes to less class and module functions cleanup