Spring cleaning

Some spring cleaning