Some sytyling & code style reworks.