Various Trivial Refactoring