ryodine Code cleanup for open source release

Users who have contributed to this file

• tombot
• ryodine
• Jared341