#185 #173 Refactoring Code (Null Check, Common Process Return Value etc)