FTGP-181, FTGP-180, started on FTGP-170 and some formating clean up of the code
Removed unnecessary resharper comment and code formating