Clean up + Added more comments.