Code comment and code improvements