Adjusted accessibility and added comments