code style rearrangement