Formatting
Removed accidentally commited file
Name refactoring
Added stringifications