General clean-up and remove roll-up code
Fix bugs
Remove yucky hard-coding