General

[BlueHawk278]

Fix all resharper flagged issues
e.g.

1. Variable names and methods that do now adhere with best practices
2. Static methods etc