Updated path settings and coding style