Fixed some bad practices. Thanks Martin!