some changes in the coding style to make it look prettier