Add more whitespace/commenting