remove redundant method and make map formatting consistent