fixed the formatting issues introduced in last commit
tidied up solution file