Applying proper code style to be consistent