Little bit changed code style