cleaned up stuff + format