Document code more and remove unused tags