styling and additional code style fixes