Further Cleaned up toString, and moved methods