Refactor - Apply more SLAP and remove uncessary method in ParseDate