Some code logic emprovements