Feature/style cleanup