Adding better paths and cleaner code