Removed unused code, added better diplaying for testing