Small WS fix and making part of the code more linear
Small WS fix and making part of the code more linear


marcosptf/pear-core,marcosptf/pear-core,marcosptf/pear-core,marcosptf/pear-core,marcosptf/pear-core,marcosptf/pear-core