cleaned up, removed depr functions, cleaned up terminal output