Code cleanup after documentation