Add more data to fact table and cleaned up code a bit