Clean Up part#1 + menu yohuu

Take this