Basic questions refactored