Formatting all files
Removed unused functionality
Removed code that makes the experiment trivial