Various small revisions and code cleanup