Code cleaning
Starting on graphics option