Cleaned the code, added paths