Document code & modify methods