Hotfixed a small bug with removing days
Also cleaned up a small amount of code