Purely aesthetic changes, moving declarations and junk