Improved naming and null checking