Added comments and cleaned url scheme