[REQS-328] Clean code and comments.