Continued refactoring to comply with StyleCop, renamed some methods