I have implemented the changes in my latest commit. Please go through them and suggest further changes wherever necessary. Thank you .