Refactoring + implemented Lorem part