Simplify current implementation to console program