Removed getElementById calls