Code reformatting to match 80 char limit (WIP)