get rid of table, pretty up inline comments