remove unused data
consistent formatting