fixed some code inspection complaints