Code reformatting to abide by 80-character limit