style change, cleaned up