Cleaned up method names, added TODO for Convert function right from text