cleanup, updates, and task refactoring (°ロ°)☝