Add wiki pages and clean up code