updated to fix style issues