Added comments
Better strcmp usage (clearer when reading the code)
Better Test Code (still not a real test...)