style changes - tweaking and finalizing