major stylez cleanup; and another fold fix beacause it is impossible!