Style and comments cleanup