Some code  improvementes. Project will refactored