Final changes

 * Replace lorem ipsum
 * Fix naming
 * Remove unnecessary empty lines in code
 * Remove unnecessary comments in code