Refactored less files