Reformat and add some comments
add more spaces
Rename
Added animation + Changed error message + Refactoring