Getting rid of redundency and fixing Path