Change names of methods
Add null value check