Move some stuff around, move comments below the function