Passed over everything with resharper cleanup code.