Cleaned up commented code in parser