Clean up the code a little, and remark on incompleteness