finalized most recent style changes
Merge pull request #59 from gabdallah222/master

finalized most recent style changes