refactor(moda.class) : general cleanup