Add some notes
Refactor getter & setter methods