style updates and code updates