Also some cleanups removing not needed includes and initializer style.
Attach a file by drag & drop or click to upload
