More pointless code removed, width of files fixed.