updated header and cleaned up formatting