Refactor more blocks