fixed for coding standards
removed unnesessary code