made changes to adhere with coding standards