Code improvement and images improvement