One-word splitting, interface for recognition
Refactoring
A bit of housekeeping
Added todo point