styling & structure refactoring