Fixed style and comment nits