Technical debt tuesday

\o/