Parser: Restructure code, rename var/method and apply more SLAP in
ParseDate