few modifications to help with style