general cleanup for readability