Code cleanup

- Changed some consts to static consts.
- Ordered all class vars / consts in a similar order.
- Other small cleanup tweaks.
- Also tweaked 2 sound files.