Table display fix
minor code cleanups