Main target properly recognized
Cleanup
Added test for formatter