Refactor code, improve accessibility