-cleaned up formatting