Cleaned up the top parser.