doing small code changes

changes are small and just fixes rehsarper suggestions to follow code
standards