Cleaned up code, print out table