Fixed some code inspection suggestions