Refactoring and additional plotting methods