Simplify methods

Simplify complex methods, introducing "guards" when possible