Wrapper: Comments, formatting, removed autogenerated files.