#28, made some changes to be in compliance with StyleCop rules.