clean ups, style change and other minor things