minor file refactor #mean-15 fixed