Change returns of some methods to be more compact

Remove return of booleans after conditional evaluation
Change multiple boolean returns to single returns with variable setting