Cleanup style
Typing functionality sort of working
Sort of improving