Code spring cleaning