cleaned up a bit for my own dev