Added some inline comments