Spring Cleaning

Signed-off-by: Tyler S. Callan <tylerscallan@me.com>