Fix minor code smell issues