Cleanup

Code cleanup for scrutinizer complaints.