Updated source and style
Remove generates fiels