Discussed in person. Will stay like this for now. Refactored the functionality in 577cc09 though