Add more documentation and change file name