Remove accidently added {
Some cleanup and improvements.