Some changes
Change a few names
Remove unneccesary helpers
Mess