Cleanup, some edits