Big cleanup, there was to much code for what I wanted to show