style updates and comments