Style changes, refactoring, search