Fixes exhaling/inhaling types, cleanup