Misc. code refactoring