Updated a few sample files
Added all the already implemented refactorings.