minor fixies; pretty code