Fix indent and remove unused maps