Fix up style comments and rename struct