Cleanup and Reorganize
ReSharper Cleanup