Note for self, this is style clean-up