small correction
code cosmetics
S3 reorganisation