indentation Fixed and some random optimization