Document views, general cleanup