Improved comments and removed logs.