new floor
coding standard cleanup
coding standard cleanup
Merge pull request #460 from ZappoMan/disco

new floor