rename get set & added more comments