refined package to only contain relevant code