Add comments
Move imports
Some more logic