style changes
added default can to stop the errors