Fixed according code review and little bit changed file's structure