Moved validation of  to separate method
Renamed method