Cleaned up main class, test class for XML Parser