cleanup for coding standard