Added suppresses and cleaned up code