table and code style changes