Internal methods renaming and more comments