Simplified some programs