Fix code view

+ Minor Refacto