Iterate design
Code style tweaks, bigfoot