Some refactoring

Small shortenings here and there