fixed issue good clean code