Style adjustments

Please merge the style adjustments