Modified previous commits to comply with code style.

Commit to be squashed after review process is completed.