tighter margins
year and category
refactored code, added comments
added comments