Refactored less files a bit