Some fixes for more readable