fiked: Clean up a bit.