Fixing coding style and component template