Changed return values of methods.
Refactored due to new return values of methods.