Improve code
Few changes