Make code even more simple