Correcting code

Updating code to follow coding conventions.