Move two functions around and remove unused import
Whitespace and warnings. pleh