Bored, so doing cleanups