Eliminated duplicate using (compiler warning)
Implemented 4 more control smokechecks