Amended for code style by Adam Honse <calcprogrammer1@gmail.com>
Squashes all commits from Merge Request !495