Some minor refactoring

Added base work on conditional statements as well.