Codebase clean up (thanks resharper)

Signed-off-by: Jamie Hankins <jamiehankin@gmail.com>