Style and code updates