Cleaned up bug time