edited for consistency and standards conformance
Merge pull request #1 from awesome271828/master

edited for consistency and standards conformance