Cleaner code

Only makes a white screen