Some cleanup and started with interface for different tick managing