Code clean & validations. Resolve #416