small comments and code tidiness