Merge pull request #480 from fahadhatib/develop

Minor code formatting changes