Style and more changes