Slightly different loader + minor cleanup