Feature/cleanups

- Rename 3 files which had "invalid" file names
- Fix a couple variable checks
- Add braces around variables