Added PST reader. Code cleanup.