cleanup

cleaner variables
restructure, we dont need to exectute code thats not needed