Misc refactoring and cleanup.
Date uses - instead of . for delimeters