Moved conditions to methods