* Code cleanup and doc