Further refactor generation ns for style