better function identifier declaretion and a little fix