Dropped history support and improved coding style