Inline documentation & file-cleanup