Style clean up
Style clean up