Eliminated trailing spaces and cleaned up code.
Merge branch 'dev' into test