Code cleanup and a new feature to detect floating point numbers