Small refactor, removing padding and improving stuff
Adds sauce