Refactor plots into bplot
Cleanup