Corrected file extensions and some style errors