Cleanup + minor edits