clean up and style additions