A bit changed code style