Extract DataEntry interface
Optimize imports
Inline methods and rewrite minor parts to avoid suppression warnings