thesis: refactore style