Taking care of the "command and query" violation

Query method doesn not have any logic now.