Change code to fit with coding guidelines