Minor edits / cleanup