Reorganize methods to booleans and add final else