Some cleanup, add documentation for auto completion