Formatting Fixes, and make CommandFinder statically compiled