Continued style revision [currently breaks build]