Fixed tracking error
Removed @author. Class names refactors