Code/Doc cleaning up