restyled code, now it feels nicer and almost complies