cleanup stuff a bit
1.0.0