general code clean-up
make things blue