Addressed code style issues