Minor code cleanup

- Uniformly filepath instead of path
- Use consistent declaration style
- Improve variable naming conventions re: ADG's Paris talk
- Avoid stuttering in some struct member naming