Formatting cleanup
Cleanup of recorder and general refactoring of recognizer