Make code a bit more readable
Use more appropriate default values