Code cleanup
Use existing method for splitting filename and extension (fixes #13)