Renovated all code and added basic null validations