Initial trading methods cleanup, making more than just MACD work right