all: Clean up code a bit.