Adhering to code style

Some syntactic changes to better align with code style standard