Tidying up based on Code Analysis