Refactored tracer methods again and shrinked code size more