Made changes to adhere to coding conventions