Overhauled filename formatting (resolves #26)