update s3tc #5, code standardization