Style: manual cleanup