more code clean, htaccess update