Removing not needed blocks
Shorter line
Index is not in use
Issue 18. Minor style changes