modularizing results, cleanup table