Submit challenge 2

with some white space fixes to challenge 1