Refactor and docs

Hi @Priyanshu-bit!, you did a great job. 
I just wanted to make some additional changes to go over the convention's again before merging. 
I also took the opportunity to make some additional changes.